Add patch to fix underlinking of test-archive

diff --git a/debian/changelog b/debian/changelog
index 229d8ae968d3e41299986180aabffc927d4dfdd9..056d889bf776b2bf5022d1b10b0ca971ca4be08f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ ostree (2016.3-1) UNRELEASED; urgency=medium
     practice
   * Only build on Linux architectures; this package is specifically
     not portable
+  * Add patch to fix underlinking of test-archive
 
  -- Simon McVittie <smcv@debian.org>  Wed, 27 Jan 2016 13:04:34 +0100
 

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..01d9dfd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+test-libarchive-fix-underlinking.patch

diff --git a/debian/patches/test-libarchive-fix-underlinking.patch b/debian/patches/test-libarchive-fix-underlinking.patch
new file mode 100644 (file)
index 0000000..0740c91
--- /dev/null
+++ b/debian/patches/test-libarchive-fix-underlinking.patch
@@ -0,0 +1,24 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Fri, 11 Mar 2016 08:46:27 +0000
+Subject: test-libarchive: fix underlinking
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+---
+ Makefile-tests.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile-tests.am b/Makefile-tests.am
+index 6ec5835..4b0a526 100644
+--- a/Makefile-tests.am
++++ b/Makefile-tests.am
+@@ -179,8 +179,8 @@ tests_test_checksum_CFLAGS = $(TESTS_CFLAGS) $(libglnx_cflags)
+ tests_test_checksum_LDADD = $(TESTS_LDADD)
+ 
+ tests_test_libarchive_import_SOURCES = tests/test-libarchive-import.c
+-tests_test_libarchive_import_CFLAGS = $(TESTS_CFLAGS) $(libglnx_cflags)
+-tests_test_libarchive_import_LDADD = $(TESTS_LDADD)
++tests_test_libarchive_import_CFLAGS = $(TESTS_CFLAGS) $(libglnx_cflags) $(OT_DEP_LIBARCHIVE_CFLAGS)
++tests_test_libarchive_import_LDADD = $(TESTS_LDADD) $(OT_DEP_LIBARCHIVE_LIBS)
+ 
+ tests_test_keyfile_utils_CFLAGS = $(TESTS_CFLAGS)
+ tests_test_keyfile_utils_LDADD = $(TESTS_LDADD)